From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 6 Jul 2009 10:50:30 +0000 (+0100)
Subject: x86 shadow: disable fast np path in OOS.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13646
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=34d140eaa742654b706530a7be9ec9bca0dea209;p=xen.git

x86 shadow: disable fast np path in OOS.

Signed off by: Gianluca Guida <gianluca.guida@eu.citrix.com>
---

diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index d00debddbb..85ed8f1962 100644
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -494,11 +494,13 @@ _sh_propagate(struct vcpu *v,
 
     if ( unlikely(!(gflags & _PAGE_PRESENT)) )
     {
+#if !(SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC)
         /* If a guest l1 entry is not present, shadow with the magic 
          * guest-not-present entry. */
         if ( level == 1 )
             *sp = sh_l1e_gnp();
         else 
+#endif /* !OOS */
             *sp = shadow_l1e_empty();
         goto done;
     }